Disable native compiler on x32

diff --git a/debian/native-archs b/debian/native-archs
index a29f0093d00657fe430d649c3c7c56f75347ea41..6b492b0638364b661e7fcc3df52f186646aa2de4 100644 (file)
--- a/debian/native-archs
+++ b/debian/native-archs
@@ -1 +1 @@
-amd64 arm64 armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x x32
+amd64 arm64 armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x

diff --git a/debian/rules b/debian/rules
index 7c69f5b854a47cac8cc9a573575b276a78b7bd3e..479fcac52b7250a9426026cd1e3b620023ccd39c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -60,8 +60,9 @@ CONFIGURE_OPTS := \
   --with-x \
   -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \
 
-# Upstream recommends dropping support, see https://github.com/ocaml/ocaml/issues/7642
-ifneq (,$(filter $(DEB_HOST_ARCH),armel))
+# Upstream recommends dropping support on armel, see https://github.com/ocaml/ocaml/issues/7642
+# Binaries generated by ocamlopt segfault on x32
+ifneq (,$(filter $(DEB_HOST_ARCH),armel x32))
 CONFIGURE_OPTS += --disable-native-compiler
 endif